auto merge of #628 : alexcrichton/cargo/issue-537, r=brson
authorbors <bors@rust-lang.org>
Tue, 30 Sep 2014 00:00:10 +0000 (00:00 +0000)
committerbors <bors@rust-lang.org>
Tue, 30 Sep 2014 00:00:10 +0000 (00:00 +0000)
commite99cacc9a9d9f6c29846132382d54858dec155c3
tree3705a313c1b78a1a89d910aca00d9b0100292003
parentaa42fe5d434d9854ef775137984e42df965cea51
parent37dbfd2ec6b8be57d2f26c2483f45294c9ddc3b7
auto merge of #628 : alexcrichton/cargo/issue-537, r=brson

This is rebased on https://github.com/rust-lang/cargo/pull/617 as I wanted to use one of the functions added in the patch. Otherwise the details are in the commits.